From c392c74e6985ee6effb4643024bbff62ba252c37 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 5 Feb 2026 01:56:15 +0000 Subject: [PATCH] really build with gcc. --- debian/changelog | 8 ++++++++ debian/control | 2 -- debian/control.in | 2 -- debian/rules | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4a1218af3..5897e189a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +webkit2gtk (2.50.4-1+rpi2) forky-staging; urgency=medium + + * Non-maintainer upload. + * Really build with gcc. + * Disable debug information completely. + + -- Peter Michael Green Thu, 05 Feb 2026 01:55:33 +0000 + webkit2gtk (2.50.4-1+rpi1) forky-staging; urgency=medium [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green at Sun, 25 Jan 2015 02:14:50 +0000] diff --git a/debian/control b/debian/control index e694c3aec9..52b94545f7 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,6 @@ Build-Depends: debhelper-compat (= 13), bubblewrap [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 hppa ppc64 x32], xdg-dbus-proxy [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 hppa ppc64 x32], libseccomp-dev [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 hppa ppc64 x32], - clang [amd64 arm64 armel i386 ppc64el riscv64 s390x], - clang-19 [armhf], cmake (>= 3.20), flite1-dev, libglib2.0-dev, diff --git a/debian/control.in b/debian/control.in index 6847cbbcec..8b1a84d970 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,8 +9,6 @@ Build-Depends: debhelper-compat (= 13), bubblewrap [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 hppa ppc64 x32], xdg-dbus-proxy [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 hppa ppc64 x32], libseccomp-dev [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 hppa ppc64 x32], - clang [amd64 arm64 armel i386 ppc64el riscv64 s390x], - clang-19 [armhf], cmake (>= 3.20), flite1-dev, libglib2.0-dev, diff --git a/debian/rules b/debian/rules index ca1a62053d..ea8589ee9e 100755 --- a/debian/rules +++ b/debian/rules @@ -49,8 +49,8 @@ endif # https://bugs.webkit.org/show_bug.cgi?id=290167 ifneq (,$(filter $(DEB_HOST_ARCH),armhf)) EXTRA_CMAKE_ARGUMENTS += \ - -DCMAKE_C_COMPILER=clang-19 \ - -DCMAKE_CXX_COMPILER=clang++-19 + -DCMAKE_C_COMPILER=gcc \ + -DCMAKE_CXX_COMPILER=g++ endif # The WebKit build scripts look at the CPU to detect the architecture. @@ -68,8 +68,8 @@ endif # The debug packages produced by webkit are huge and cause problems in # most buildds. Use -g1 in all architectures to make them smaller. -CFLAGS := $(CFLAGS:-g=-g1) -CXXFLAGS := $(CXXFLAGS:-g=-g1) +CFLAGS := $(CFLAGS:-g=) +CXXFLAGS := $(CXXFLAGS:-g=) # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949621 LDFLAGS += -Wl,--reduce-memory-overheads -- 2.30.2